From: Signed-off-by: Jim Fehlig <jfehlig@novell.com>
Date: Thu, 17 Feb 2011 19:52:20 +0000 (+0000)
Subject: libxl: Clear file object on successful munmap()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10749
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=fc235724cd839639486084dfa4327cbc67b74273;p=xen.git

libxl: Clear file object on successful munmap()

Clear members of libxl_file_reference when file is successfully unmapped.

Signed-off-by: Jim Fehlig <jfehlig@novell.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/tools/libxl/libxl_internal.c b/tools/libxl/libxl_internal.c
index b50c2418bb..2aa87f7181 100644
--- a/tools/libxl/libxl_internal.c
+++ b/tools/libxl/libxl_internal.c
@@ -233,6 +233,12 @@ int libxl__file_reference_unmap(libxl_file_reference *f)
 		return 0;
 
 	ret = munmap(f->data, f->size);
+	if (ret == 0) {
+		f->mapped = 0;
+		f->data = NULL;
+		f->size = 0;
+		return 0;
+	}
 
-	return ret == 0 ? 0 : ERROR_FAIL;
+	return ERROR_FAIL;
 }